Merge
authorack@localhost.localdomain <ack@localhost.localdomain>
Fri, 30 Jun 2006 16:12:31 +0000 (17:12 +0100)
committerack@localhost.localdomain <ack@localhost.localdomain>
Fri, 30 Jun 2006 16:12:31 +0000 (17:12 +0100)

Trivial merge